[FLANG] Fix for issue #127426 #150006
Closed
[FLANG] Fix for issue #127426 #150006
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
flang
Member
|
@llvm/pr-subscribers-flang-parser Author: Aadesh Premkumar (aadeshps-mcw) ChangesFull diff: https://github.com/llvm/llvm-project/pull/150006.diff 3 Files Affected:
diff --git a/flang/lib/Parser/prescan.cpp b/flang/lib/Parser/prescan.cpp
index 3a9a475c365ee..ceb3d91c216cc 100644
--- a/flang/lib/Parser/prescan.cpp
+++ b/flang/lib/Parser/prescan.cpp
@@ -435,6 +435,7 @@ void Prescanner::LabelField(TokenSequence &token) {
int outCol{1};
const char *start{at_};
std::optional<int> badColumn;
+ SkipCComments();
for (; *at_ != '\n' && column_ <= 6; ++at_) {
if (*at_ == '\t') {
++at_;
diff --git a/flang/test/Parser/inc.h b/flang/test/Parser/inc.h
new file mode 100644
index 0000000000000..a754bfbbbc641
--- /dev/null
+++ b/flang/test/Parser/inc.h
@@ -0,0 +1,4 @@
+/* Old style C comments
+*comments
+*/
+#define VAL 1
diff --git a/flang/test/Parser/test.F b/flang/test/Parser/test.F
new file mode 100644
index 0000000000000..94436d70faa05
--- /dev/null
+++ b/flang/test/Parser/test.F
@@ -0,0 +1,14 @@
+! RUN: %flang_fc1 -fdebug-unparse-no-sema %s 2>&1 | FileCheck %s
+
+!CHECK: SUBROUTINE foo
+!CHECK: INTEGER i
+!CHECK: i = 1
+!CHECK: PRINT *, i
+!CHECK: END SUBROUTINE foo
+
+ subroutine foo ()
+#include "inc.h"
+ integer :: i
+ i = VAL
+ print *,i
+ end subroutine foo
|
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions h,cpp -- flang/test/Parser/inc.h flang/lib/Parser/prescan.cppView the diff from clang-format here.diff --git a/flang/test/Parser/inc.h b/flang/test/Parser/inc.h
index a754bfbbb..15eb75b25 100644
--- a/flang/test/Parser/inc.h
+++ b/flang/test/Parser/inc.h
@@ -1,4 +1,4 @@
/* Old style C comments
-*comments
-*/
+ *comments
+ */
#define VAL 1
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.